cleanup: Rebase spawn API on top of libgsystem GSSubprocess

We didn't need most the parameters anyways, so this is fewer lines of
code.  It also helps me test GSubprocess.

diff --git a/src/libgsystem b/src/libgsystem
index 6956ab38077c65ffda21c30bcc4adee2d4826146..c17376d4acbddfa1909d24167d3ce24531b3db1a 160000 (submodule)
--- a/src/libgsystem
+++ b/src/libgsystem
@@ -1 +1 @@
-Subproject commit 6956ab38077c65ffda21c30bcc4adee2d4826146
+Subproject commit c17376d4acbddfa1909d24167d3ce24531b3db1a

diff --git a/src/libotutil/ot-spawn-utils.c b/src/libotutil/ot-spawn-utils.c
index c05ac3b111f59f4544aa3db56b9fb81254d56556..5a551fe11a36cd741c75c1f0682a5c718aae0bd5 100644 (file)
--- a/src/libotutil/ot-spawn-utils.c
+++ b/src/libotutil/ot-spawn-utils.c
@@ -29,27 +29,21 @@
 gboolean
 ot_spawn_sync_checked (const char           *cwd,
                        char                **argv,
-                       char                **envp,
-                       GSpawnFlags           flags,
-                       GSpawnChildSetupFunc  child_setup,
-                       gpointer              user_data,
-                       char                **stdout_data,
-                       char                **stderr_data,
+                       GCancellable         *cancellable,
                        GError              **error)
 {
   gboolean ret = FALSE;
-  gint exit_status;
-  char *ret_stdout_data = NULL;
-  char *ret_stderr_data = NULL;
+  gs_lobj GSSubprocessContext *context = NULL;
+  gs_lobj GSSubprocess *proc = NULL;
 
-  if (!g_spawn_sync (cwd, argv, envp, flags, child_setup, user_data,
-                     stdout_data ? &ret_stdout_data : NULL,
-                     stderr_data ? &ret_stderr_data : NULL,
-                     &exit_status,
-                     error))
+  context = gs_subprocess_context_new (argv);
+  if (cwd)
+    gs_subprocess_context_set_cwd (context, cwd);
+
+  if ((proc = gs_subprocess_new (context, error)) == NULL)
     goto out;
   
-  if (!g_spawn_check_exit_status (exit_status, error))
+  if (!gs_subprocess_wait_sync_check (proc, cancellable, error))
     goto out;
 
   ret = TRUE;

diff --git a/src/libotutil/ot-spawn-utils.h b/src/libotutil/ot-spawn-utils.h
index 6bd405818dc6b4f7000d048b842ac4c781cadc5b..4673e27c230a457eb82405b01854a8f4281a1a54 100644 (file)
--- a/src/libotutil/ot-spawn-utils.h
+++ b/src/libotutil/ot-spawn-utils.h
@@ -29,12 +29,7 @@ G_BEGIN_DECLS
 
 gboolean ot_spawn_sync_checked (const char           *cwd,
                                 char                **argv,
-                                char                **envp,
-                                GSpawnFlags           flags,
-                                GSpawnChildSetupFunc  child_setup,
-                                gpointer              user_data,
-                                char                **stdout_data,
-                                char                **stderr_data,
+                                GCancellable         *cancellable,
                                 GError              **error);
 
 GThreadPool * ot_thread_pool_new_nproc (GFunc     func,

diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
index 92026e7c1d3a5fb50dbe4e00ae3dc211608d7878..924640d4c13f5ed57082d00279c07da7d1ec72a2 100644 (file)
--- a/src/ostree/ot-admin-builtin-deploy.c
+++ b/src/ostree/ot-admin-builtin-deploy.c
@@ -553,8 +553,7 @@ do_update_kernel (OtAdminDeploy     *self,
   g_ptr_array_add (args, NULL);
 
   if (!ot_spawn_sync_checked (gs_file_get_path_cached (self->ostree_dir),
-                              (char**)args->pdata, NULL, G_SPAWN_SEARCH_PATH,
-                              NULL, NULL, NULL, NULL, error))
+                              (char**)args->pdata, cancellable, error))
     goto out;
 
   ret = TRUE;

diff --git a/src/ostree/ot-admin-builtin-prune.c b/src/ostree/ot-admin-builtin-prune.c
index 3465417354dba9cadfff5e8439e117f92c7310d9..3e5d7553beca0efeebc1340d6397ca8d9adcef77 100644 (file)
--- a/src/ostree/ot-admin-builtin-prune.c
+++ b/src/ostree/ot-admin-builtin-prune.c
@@ -166,8 +166,8 @@ ot_admin_builtin_prune (int argc, char **argv, GFile *ostree_dir, GError **error
       g_ptr_array_add (prune_argv, NULL);
       
       if (!ot_spawn_sync_checked (gs_file_get_path_cached (ostree_dir),
-                                  (char**)prune_argv->pdata, NULL, G_SPAWN_SEARCH_PATH,
-                                  NULL, NULL, NULL, NULL, error))
+                                  (char**)prune_argv->pdata,
+                                  cancellable, error))
         goto out;
     }
 

diff --git a/src/ostree/ot-admin-builtin-pull-deploy.c b/src/ostree/ot-admin-builtin-pull-deploy.c
index 10a5d5450518800a862daa4ddf8b0a71be441212..7fed1e6ee31de5cf3fe809ce21e53d8bbf09d6b0 100644 (file)
--- a/src/ostree/ot-admin-builtin-pull-deploy.c
+++ b/src/ostree/ot-admin-builtin-pull-deploy.c
@@ -153,8 +153,8 @@ ot_admin_builtin_pull_deploy (int argc, char **argv, GFile *ostree_dir, GError *
     g_ptr_array_add (subproc_args, NULL);
 
     if (!ot_spawn_sync_checked (gs_file_get_path_cached (ostree_dir),
-                                (char**)subproc_args->pdata, NULL, G_SPAWN_SEARCH_PATH,
-                                NULL, NULL, NULL, NULL, error))
+                                (char**)subproc_args->pdata,
+                                cancellable, error))
       goto out;
     
     g_clear_pointer (&subproc_args, (GDestroyNotify)g_ptr_array_unref);
@@ -170,8 +170,8 @@ ot_admin_builtin_pull_deploy (int argc, char **argv, GFile *ostree_dir, GError *
     g_ptr_array_add (subproc_args, NULL);
 
     if (!ot_spawn_sync_checked (gs_file_get_path_cached (ostree_dir),
-                                (char**)subproc_args->pdata, NULL, G_SPAWN_SEARCH_PATH,
-                                NULL, NULL, NULL, NULL, error))
+                                (char**)subproc_args->pdata,
+                                cancellable, error))
       goto out;
   }
 

diff --git a/src/ostree/ot-admin-builtin-update-kernel.c b/src/ostree/ot-admin-builtin-update-kernel.c
index c2f72268fcf7e29c8177eb63051e6079187ce734..8d6774e1e6f76d5d9910d550ea18d59b42e869ec 100644 (file)
--- a/src/ostree/ot-admin-builtin-update-kernel.c
+++ b/src/ostree/ot-admin-builtin-update-kernel.c
@@ -129,9 +129,8 @@ update_initramfs (OtAdminUpdateKernel  *self,
       g_ptr_array_add (mkinitramfs_args, NULL);
           
       g_print ("Generating initramfs using %s...\n", deploy_path);
-      if (!ot_spawn_sync_checked (NULL, (char**)mkinitramfs_args->pdata, NULL,
-                                  G_SPAWN_SEARCH_PATH,
-                                  NULL, NULL, NULL, NULL, error))
+      if (!ot_spawn_sync_checked (NULL, (char**)mkinitramfs_args->pdata,
+                                  cancellable, error))
         goto out;
           
       initramfs_tmp_file = g_file_get_child (tmpdir, "initramfs-ostree.img");
@@ -266,8 +265,8 @@ update_grub (OtAdminUpdateKernel  *self,
           g_ptr_array_add (grubby_args, NULL);
 
           g_print ("Adding OSTree grub entry...\n");
-          if (!ot_spawn_sync_checked (NULL, (char**)grubby_args->pdata, NULL, G_SPAWN_SEARCH_PATH,
-                                      NULL, NULL, NULL, NULL, error))
+          if (!ot_spawn_sync_checked (NULL, (char**)grubby_args->pdata,
+                                      cancellable, error))
             goto out;
         } 
       else

diff --git a/src/ostree/ot-admin-functions.c b/src/ostree/ot-admin-functions.c
index c291e9e099f4d2a19fe61b651ac5bb2c513804a7..e7e3e5ad57420f28e8c5c04e634a60d3a6fc123d 100644 (file)
--- a/src/ostree/ot-admin-functions.c
+++ b/src/ostree/ot-admin-functions.c
@@ -57,8 +57,7 @@ ot_admin_ensure_initialized (GFile         *ostree_dir,
                                                       gs_file_get_path_cached (ostree_dir));
       const char *child_argv[] = { "ostree", opt_repo_arg, "init", NULL };
 
-      if (!ot_spawn_sync_checked (NULL, (char**)child_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
-                                  NULL, NULL, error))
+      if (!ot_spawn_sync_checked (NULL, (char**)child_argv, cancellable, error))
         {
           g_prefix_error (error, "Failed to initialize repository: ");
           goto out;